bitkeeper revision 1.1236.43.9 (42441631VxhWONemyRXIOoB5s3kllQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc xen/arch/x86/mm.c
index d417baf39db1855e24c659f21b2f49a4a544e7fb,775af202097dc6af8ab470d7b06e8fbfde4d5f63..d92c03e7971a758c4ebec16d862498696d34f8df
--- 1/xen/arch/x86/mm.c
--- 2/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@@ -2394,12 -2394,8 +2394,13 @@@ void ptwr_flush(const int which
                     (L1_PAGETABLE_ENTRIES - i) * sizeof(l1_pgentry_t));
              unmap_domain_mem(pl1e);
              ptwr_info[cpu].ptinfo[which].l1va = 0;
 +            if ( (which == PTWR_PT_ACTIVE) && likely(!d->mm.shadow_mode) )
 +            {
 +                pl2e = &linear_l2_table[ptwr_info[cpu].ptinfo[which].l2_idx];
 +                *pl2e = mk_l2_pgentry(l2_pgentry_val(*pl2e) | _PAGE_PRESENT); 
 +            }
              domain_crash();
+             return;
          }
          
          if ( unlikely(sl1e != NULL) )